From: Juanma Barranquero <lekktu@gmail.com>
Date: Fri, 30 Apr 2004 21:12:42 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~22817
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=ce7b2b2e777d7ca324190ac6c3fe9d70d49316a1;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7a7d90921f5..c9a884fca61 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-30  Juanma Barranquero  <lektu@terra.es>
+
+	* smerge-mode.el (smerge-diff-switches): Fix typo in docstring.
+
 2004-04-30  Mario Lang  <mlang@delysid.org>
 
 	* diff.el (diff-switches): Fix typo in docstring.